Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 18 Nov 2005 13:30:47 +0000 (14:30 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 18 Nov 2005 13:30:47 +0000 (14:30 +0100)

Trivial merge